menubar: Use gtk_widget_class_set_accessible_role()

diff --git a/gtk/a11y/gtkmenushellaccessible.c b/gtk/a11y/gtkmenushellaccessible.c
index 5cdf71ebdd326c6f1af52b33ad6b79f762c8c309..3bebe796505931316d494e2425290061a47b10a7 100644 (file)
--- a/gtk/a11y/gtkmenushellaccessible.c
+++ b/gtk/a11y/gtkmenushellaccessible.c
@@ -34,10 +34,7 @@ gtk_menu_shell_accessible_initialize (AtkObject *accessible,
 {
   ATK_OBJECT_CLASS (_gtk_menu_shell_accessible_parent_class)->initialize (accessible, data);
 
-  if (GTK_IS_MENU_BAR (data))
-    accessible->role = ATK_ROLE_MENU_BAR;
-  else
-    accessible->role = ATK_ROLE_UNKNOWN;
+  accessible->role = ATK_ROLE_UNKNOWN;
 }
 
 static void

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index c54bc79244be6778f100cc5f278d2530d213d880..428cf51fb74b3e4643bfb378e1c3c0ef5e14021f 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -130,6 +130,8 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
   widget_class->draw = gtk_menu_bar_draw;
   widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
   
+  gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
+
   menu_shell_class->submenu_placement = GTK_TOP_BOTTOM;
   menu_shell_class->get_popup_delay = gtk_menu_bar_get_popup_delay;
   menu_shell_class->move_current = gtk_menu_bar_move_current;